Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

1.12.0-beta.1 bug - use dynamic s3 prefix in addAmazonVPCCNIPermissions func #6762

Merged
merged 1 commit into from
Apr 10, 2019
Merged

1.12.0-beta.1 bug - use dynamic s3 prefix in addAmazonVPCCNIPermissions func #6762

merged 1 commit into from
Apr 10, 2019

Conversation

bksteiny
Copy link
Contributor

This PR is for #6754 (more info in that issue), which is currently a problem in the 1.12.0-beta.1 release. #6389 introduced a bug that only applies IAM policies correctly for AWS environments, and doesn't take into account AWS China and AWS Gov.

This change utilizes the IAMPrefix function to account for those environments.

Before

  IAMRolePolicy/nodes.xxx.k8s.local
  	PolicyDocument      
  	                    	...
  	                    	          "*"
  	                    	        ]
  	                    	+     },
  	                    	+     {
  	                    	+       "Effect": "Allow",
  	                    	+       "Action": [
  	                    	+         "ec2:CreateTags"
  	                    	+       ],
  	                    	+       "Resource": [
  	                    	+         "arn:aws:ec2:*:*:network-interface/*"
  	                    	+       ]
  	                    	      }
  	                    	    ]
  	                    	...

After

  IAMRolePolicy/nodes.xxx.k8s.local
  	PolicyDocument      
  	                    	...
  	                    	          "*"
  	                    	        ]
  	                    	+     },
  	                    	+     {
  	                    	+       "Effect": "Allow",
  	                    	+       "Action": [
  	                    	+         "ec2:CreateTags"
  	                    	+       ],
  	                    	+       "Resource": [
  	                    	+         "arn:aws-cn:ec2:*:*:network-interface/*"
  	                    	+       ]
  	                    	      }
  	                    	    ]
  	                    	...

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Apr 10, 2019
@k8s-ci-robot
Copy link
Contributor

Hi @bksteiny. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 10, 2019
@mikesplain
Copy link
Contributor

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Apr 10, 2019
@mikesplain mikesplain added this to the 1.12 milestone Apr 10, 2019
mikesplain
mikesplain approved these changes Apr 10, 2019
View reviewed changes
Copy link
Contributor

@mikesplain mikesplain left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great find @bksteiny! Thanks so much!

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 10, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bksteiny, mikesplain

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 10, 2019
@bksteiny bksteiny mentioned this pull request Apr 10, 2019
Closed
@k8s-ci-robot k8s-ci-robot merged commit a8e140d into kubernetes:master Apr 10, 2019
@mikesplain mikesplain mentioned this pull request Apr 10, 2019
Merged
@bksteiny bksteiny mentioned this pull request Apr 10, 2019
Closed
k8s-ci-robot added a commit that referenced this pull request Apr 11, 2019
@k8s-ci-robot
Merge pull request #6765 from mikesplain/automated-cherry-pick-of-#67…
9aab220 
…62-origin-release-1.12

Automated cherry pick of #6762: use dynamic s3 prefix in addAmazonVPCCNIPermissions func
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mikesplain mikesplain mikesplain approved these changes

@rdrgmnzs rdrgmnzs Awaiting requested review from rdrgmnzs

@robinpercy robinpercy Awaiting requested review from robinpercy

Assignees

@mikesplain mikesplain

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cherry-pick cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v1.12
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@bksteiny @k8s-ci-robot @mikesplain